From: Alan Mackenzie <acm@muc.de>
Date: Fri, 28 Oct 2011 14:37:05 +0000 (+0000)
Subject: Boring merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~428
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab;p=emacs.git

Boring merge.
---

1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab